From: Raspbian automatic forward porter Date: Fri, 3 Jul 2026 10:46:37 +0000 (+0100) Subject: Merge version 5.4.0-3+rpi1 and 5.4.1-1 to produce 5.4.1-1+rpi1 X-Git-Tag: archive/raspbian/5.4.1-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi//%22https:/www.geocaching.com/profile/%22http:/www.example.com/cgi/%22https:/www.geocaching.com/profile?a=commitdiff_plain;h=9131bde687d231132e2e1e5b60dc48e76479f2cb;p=ocaml.git Merge version 5.4.0-3+rpi1 and 5.4.1-1 to produce 5.4.1-1+rpi1 --- 9131bde687d231132e2e1e5b60dc48e76479f2cb diff --cc debian/changelog index f1a6a6fb,98946c9b..ef7ef7fd --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,12 +1,26 @@@ - ocaml (5.4.0-3+rpi1) forky-staging; urgency=medium ++ocaml (5.4.1-1+rpi1) forky-staging; urgency=medium + + [changes brought forward from 4.08.1-4+rpi2 by Peter Michael Green at Tue, 26 Nov 2019 19:38:59 +0000] + * Revert previous raspbian changes, changing the triplet + now seems to cause more problems than it solves (specifically + it causes ocaml to try and use nonexistant compilers). + * Edit configure.ac to select armv6 when using "arm-linux-gnueabihf" + * Partially fix clean target. + + [changes introduced in 4.08.1-5+rpi1 by Peter Michael Green] + * Remove gitattributes that cause problems for dgit. + - -- Raspbian forward porter Thu, 26 Feb 2026 21:33:54 +0000 ++ -- Raspbian forward porter Fri, 03 Jul 2026 10:46:36 +0000 ++ + ocaml (5.4.1-1) unstable; urgency=medium + + * New upstream release (Closes: #1129317, CVE-2026-28364) + * Stabilize compiler-libs ABI by not including config.cmx + * Print .cmi flags in objinfo + * Bump Standards-Version to 4.7.3 + * Remove Priority field from debian/control + + -- Stéphane Glondu Tue, 16 Jun 2026 21:25:11 +0200 ocaml (5.4.0-3) unstable; urgency=medium diff --cc debian/patches/series index e1a7c8cd,21780bba..92e866fc --- a/debian/patches/series +++ b/debian/patches/series @@@ -3,6 -3,5 +3,7 @@@ Trigger-output-complete-exe-on-custom-w Do-not-error-on-warnings-in-autoconf.patch Use-CCLINKFLAGS-for-linking-all-executables-and-shar.patch Mark-test_compact_manydomains-as-multicore.patch - Increase-the-amount-of-data-written-to-a-pipe-in-a-test.patch + Compile-utils-config.-cmi-cmx-with-opaque.patch + Print-.cmi-flags-in-objinfo.patch +use-armv6-for-raspbian.patch +remove-gitattributes-that-cause-problems.patch